Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Tue, 24 Jul 2007 13:53:06 +0000 (14:53 +0100)
committerTim Deegan <Tim.Deegan@xensource.com>
Tue, 24 Jul 2007 13:53:06 +0000 (14:53 +0100)

Trivial merge